Update names and dependencies

diff --git a/rust-bindings/rust/.gitignore b/rust-bindings/rust/.gitignore
index 8899eafb38a23305c1eba4aadae1d71ccaae0544..4f0ac53740b699cc42779e63436a2172148772a0 100644 (file)
--- a/rust-bindings/rust/.gitignore
+++ b/rust-bindings/rust/.gitignore
@@ -1,2 +1,3 @@
 /.idea
 /*/target
+**/*.rs.bk

diff --git a/rust-bindings/rust/libostree-sys/Cargo.lock b/rust-bindings/rust/libostree-sys/Cargo.lock
index c812448abb763b080f61dfa6c29be8e794cab58b..8f49eb54d55d28c451374290dab5cbc3a6b7a4d4 100644 (file)
--- a/rust-bindings/rust/libostree-sys/Cargo.lock
+++ b/rust-bindings/rust/libostree-sys/Cargo.lock
@@ -17,15 +17,48 @@ name = "fuchsia-zircon-sys"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "gio-sys"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "glib-sys"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "gobject-sys"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "libc"
 version = "0.2.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "os-tree-sys"
+name = "libostree-sys"
 version = "0.2.0"
 dependencies = [
+ "gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
  "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "shell-words 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -92,6 +125,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
 "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
 "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
+"checksum gio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6975ada29f7924dc1c90b30ed3b32d777805a275556c05e420da4fbdc22eb250"
+"checksum glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3573351e846caed9f11207b275cd67bc07f0c2c94fb628e5d7c92ca056c7882d"
+"checksum gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08475e4a08f27e6e2287005950114735ed61cec2cb8c1187682a5aec8c69b715"
 "checksum libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "76e3a3ef172f1a0b9a9ff0dd1491ae5e6c948b94479a3021819ba7d860c8645d"
 "checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c"
 "checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd"

diff --git a/rust-bindings/rust/libostree-sys/Cargo.toml b/rust-bindings/rust/libostree-sys/Cargo.toml
index d215800d8c90df51accdca1e44e7044b9e2143eb..8906847e10e2f380fea61c0ec1387774f29faf7f 100644 (file)
--- a/rust-bindings/rust/libostree-sys/Cargo.toml
+++ b/rust-bindings/rust/libostree-sys/Cargo.toml
@@ -2,6 +2,9 @@
 pkg-config = "0.3.7"
 
 [dependencies]
+gio-sys = "^0.7"
+glib-sys = "^0.7"
+gobject-sys = "^0.7"
 libc = "0.2"
 
 [dev-dependencies]
@@ -30,10 +33,10 @@ v2018_6 = ["v2018_5"]
 v2018_7 = ["v2018_6"]
 
 [lib]
-name = "os_tree_sys"
+name = "libostree_sys"
 
 [package]
 build = "build.rs"
-links = "os_tree"
-name = "os-tree-sys"
+links = "ostree"
+name = "libostree-sys"
 version = "0.2.0"

diff --git a/rust-bindings/rust/libostree-sys/tests/abi.rs b/rust-bindings/rust/libostree-sys/tests/abi.rs
index b056a2d3e8b414d9c90596307e3c23f78b6a1da1..cddc6f600b9e5370a1a1876a839092ecbb20a0fd 100644 (file)
--- a/rust-bindings/rust/libostree-sys/tests/abi.rs
+++ b/rust-bindings/rust/libostree-sys/tests/abi.rs
@@ -2,7 +2,7 @@
 // from gir-files (https://github.com/gtk-rs/gir-files @ ???)
 // DO NOT EDIT
 
-extern crate os_tree_sys;
+extern crate libostree_sys;
 extern crate shell_words;
 extern crate tempdir;
 use std::env;
@@ -11,7 +11,7 @@ use std::path::Path;
 use std::mem::{align_of, size_of};
 use std::process::Command;
 use std::str;
-use os_tree_sys::*;
+use libostree_sys::*;
 
 static PACKAGES: &[&str] = &["ostree-1"];